merge
authorIan Campbell <ian.campbell@xensource.com>
Mon, 22 Jan 2007 15:43:48 +0000 (15:43 +0000)
committerIan Campbell <ian.campbell@xensource.com>
Mon, 22 Jan 2007 15:43:48 +0000 (15:43 +0000)

Trivial merge